Don't modify strings returned from gettext().

2005-06-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label):
	Don't modify strings returned from gettext().

diff --git a/ChangeLog b/ChangeLog
index d51fc420334057d5baded67c743193c213c033e6..91b7b97c2d3c226248355f872c90cfedbf4a76b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
+       Don't modify strings returned from gettext().
+
 Fri Jun 10 19:06:03 2005  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtktextdisplay.c (render_para): don't use deprecated

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d51fc420334057d5baded67c743193c213c033e6..91b7b97c2d3c226248355f872c90cfedbf4a76b2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
+       Don't modify strings returned from gettext().
+
 Fri Jun 10 19:06:03 2005  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtktextdisplay.c (render_para): don't use deprecated

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d51fc420334057d5baded67c743193c213c033e6..91b7b97c2d3c226248355f872c90cfedbf4a76b2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
+       Don't modify strings returned from gettext().
+
 Fri Jun 10 19:06:03 2005  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtktextdisplay.c (render_para): don't use deprecated

diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 88f9dad49b19cb3c3d3ed1bce8d690ca2e247436..cca5d342f96fb430a42080e9b56517d60d7a7fcc 100644 (file)
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -597,12 +597,17 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,
       else 
        {
          gchar msg[128];
+         gchar *str;
       
          strcpy (msg, "keyboard label|");
          g_strlcat (msg, tmp, 128);
-         tmp = g_strip_context (msg, dgettext (GETTEXT_PACKAGE, msg));
-         substitute_underscores (tmp);
+         str = dgettext (GETTEXT_PACKAGE, msg);
+         if (str == msg)
+           substitute_underscores (tmp);
+         else
+           tmp = str;
        }
+
       g_string_append (gstring, tmp);
     }